Skip to content

elfutils: rebase cxx-header-collision.patch#370365

Merged
risicle merged 1 commit intoNixOS:masterfrom
RossComputerGuy:fix/elfutils
Jan 12, 2025
Merged

elfutils: rebase cxx-header-collision.patch#370365
risicle merged 1 commit intoNixOS:masterfrom
RossComputerGuy:fix/elfutils

Conversation

@RossComputerGuy
Copy link
Member

@RossComputerGuy RossComputerGuy commented Jan 2, 2025

Things done

Fix cxx-header-collision.patch for LLVM.

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Jan 2, 2025
@lucasew
Copy link
Contributor

lucasew commented Jan 3, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 370365

@lucasew
Copy link
Contributor

lucasew commented Jan 3, 2025

Please rebase the PR, or force push, so eval runs again.

@RossComputerGuy
Copy link
Member Author

RossComputerGuy commented Jan 3, 2025

Eval is working as expected, #330567 + Mic92/nixpkgs-review#440 would allow for evaluating pkgsLLVM with nixpkgs-review.

@risicle
Copy link
Contributor

risicle commented Jan 12, 2025

Assume this issue is not addressed by https://sourceware.org/git/?p=elfutils.git;a=commit;f=config/eu.am;h=b426c4db31e7c80d4262abdd845d2ece0c9a841c then?

@RossComputerGuy
Copy link
Member Author

RossComputerGuy commented Jan 12, 2025

Assume this issue is not addressed by

Yes, I believe this PR already mentioned that I tried having this fixed upstream but their fix didn't work in Nix but worked on Gentoo.

risicle
risicle approved these changes Jan 12, 2025
View reviewed changes
Copy link
Contributor

@risicle risicle left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

WFM, nixos x86_64 pkgsLLVM

@risicle
Copy link
Contributor

risicle commented Jan 12, 2025

Though I do wonder if this should be aimed at staging to save pkgsLLVM users from unexpected rebuilds, even though hydra isn't affected.

@RossComputerGuy
Copy link
Member Author

RossComputerGuy commented Jan 12, 2025

Though I do wonder if this should be aimed at staging to save pkgsLLVM users from unexpected rebuilds, even though hydra isn't affected.

Historically, pkgsLLVM has been exempt due to the low number of expect users. Plus, many things people might need don't work in nixpkgs without using my Nixpkgs LLVM workspace repo.

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label Jan 12, 2025
@risicle risicle merged commit 0581f46 into NixOS:master Jan 12, 2025
@RossComputerGuy RossComputerGuy deleted the fix/elfutils branch January 13, 2025 01:07
@RossComputerGuy RossComputerGuy mentioned this pull request Jan 24, 2025
Open
13 tasks
@rhelmot rhelmot mentioned this pull request Jun 8, 2025
Closed
14 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@risicle risicle risicle approved these changes

Assignees

No one assigned

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@RossComputerGuy @lucasew @risicle @wegank